From: Hans Ulrich Niedermann Date: Sun, 18 Oct 2020 17:55:13 +0000 (+0200) Subject: Clarify comments on ConditionEnvironment placement X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~691 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d263f5731c094c412446cc671d511279d6b010ad;p=gnome-shell.git Clarify comments on ConditionEnvironment placement Clarify the comments on ConditionEnvironment= by mentioning that a ConditionEnvironment= line must be located in the [Unit] section. The comments suggesting using ConditionEnvironment= themselves are in the [Service] section, which implicitly and wrongly suggests that ConditionEnvironment= could be defined right there as well. Part-of: --- diff --git a/data/org.gnome.Shell@wayland.service.in b/data/org.gnome.Shell@wayland.service.in index 12f7fbaa7..38887eb19 100644 --- a/data/org.gnome.Shell@wayland.service.in +++ b/data/org.gnome.Shell@wayland.service.in @@ -16,9 +16,9 @@ Before=gnome-session-initialized.target [Service] Slice=session.slice Type=notify -# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I -# with systemd >= 246. Also, the current solution is kind of painful -# as systemd had a bug where it retries the condition. +# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in +# the [Unit] section with systemd >= 246. Also, the current solution is +# kind of painful as systemd had a bug where it retries the condition. # Only start if the template instance matches the session type. ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2' ExecStart=@bindir@/gnome-shell diff --git a/data/org.gnome.Shell@x11.service.in b/data/org.gnome.Shell@x11.service.in index f2ff0ce34..7310f6608 100644 --- a/data/org.gnome.Shell@x11.service.in +++ b/data/org.gnome.Shell@x11.service.in @@ -20,9 +20,9 @@ StartLimitBurst=3 [Service] Slice=session.slice Type=notify -# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I -# with systemd >= 246. Also, the current solution is kind of painful -# as systemd had a bug where it retries the condition. +# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in +# the [Unit] section with systemd >= 246. Also, the current solution is +# kind of painful as systemd had a bug where it retries the condition. # Only start if the template instance matches the session type. ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2' ExecStart=@bindir@/gnome-shell